Merge remote-tracking branch 'origin/master'
authorRobert Lipe <robertlipe@gpsbabel.org>
Fri, 13 Nov 2015 04:09:11 +0000 (22:09 -0600)
committerRobert Lipe <robertlipe@gpsbabel.org>
Fri, 13 Nov 2015 04:09:11 +0000 (22:09 -0600)

Trivial merge